Cleanup - Added more tests
Merge pull request #128 from pmampe/cleanup

Cleanup - Added more tests