Adding JUnit4 functionality to core tests