Moving test-classes to nontest-classes