fix linter
fix tests
Merge pull request #81 from skinnybrit51/fix/lint-and-tests

Fix/lint and tests