Make generated test OSGi friendly and ready for the new infrastructure based on Arquillian (generated code is much simpler even for core tests)