Minor renaming updates to some of the files
Removed small test file