Clean up some files
Add test coverage files