Clean up tests and files

Files in use start with caps, deprecated files don't