moved tests to appropriate files