Add tests for untested functionality and trimmed out unused code
Merge pull request #13 from webkom/test-upgrade

Add tests for untested functionality and trimmed out unused code