Clean up to make Golint happy
Fix some discrepancies
Add info about the tests
Add Tests