Calling ExpectedException.expect in a test will cause subsequent
tests to be silently skipped when the expected exception is raised.
Refactor the tests to not make multiple calls to expect().
At the same time, fix usage of the projects API that was causing
the newly separated tests to fail. These failures were not noticed
before due to the incorrect usage of ExpectedException.
Change-Id: I432c7cef00b2c668d5a23e935e35a14ee9ba24f3
(cherry picked from commit c21cf36c6a)
9890a21239