Moved tests to appropriate directory