Moved files to tests