changes based on intellij analysis; more easymock cleanup