Merge "Migrate Telecom tests to JUnit4"