easymock added, small reformat