cleanup junit assertion sense (use assertEquals, etc)