Migrate tests to junit 4