Remove extraneous comments
Add test files