Moved tests out of direct reach of non-test classes