EA-21 - Removing bean id on mocks that is duplicated in real beans, so that other module tests that include the test-jar along with api-1.9 or api-1.10 don't fail