Added tests and test cases for a few files
Removing nasty leading underscores
Merge pull request #165 from captainbrosset/coverage

Increasing the test coverage a bit