moving to junit