Moves all tests to junit4