Convert tests to JUnit 4 @Tests

Change-Id: Ic0eb0bdb83fb998f35f4026ca0062a34a6b20bb0
14 files changed