Moved some files and cleaned up redundant tests