upgraded junit, fixed two tests