Moved simpletest files into correct location