Migrate test code base to Junit4