Fixed unittests.
Pylint.
Merged from master.
Merge pull request #19 from courageousillumination/fix_tests

Fix tests