Migrated everything to junit4