Moving to junit