Moved files to appropriate test projects

#2258