Small code cleanup
Updating tests
Merge pull request #1 from hoborglabs/development

Tests