easymock re-added