moved tests to appropriate location