STS convert some tests to JUnit4

Bug: 219090760
Bug: 218715631
Test: affected tests run
Change-Id: I42f438927be483042d7118838580e4e569426c69
6 files changed