Updated to junit 4