adds a few style + functionality fixes
Merge pull request #1 from mosesn/fix-tests-review

Fix tests review