classes moved from test context to production