Fix tests

These have been broken for a long time [not sure how long]. Also take
the opportunity to convert these to JUnit4 tests.

Change-Id: Ie80207f905868a0cc1a73cb1f540828d11b21d11
1 file changed