Remove some files and copy a test over