Migrate to junit