Fix linting warnings
Merge pull request #55 from mrchilds/fix_linting

Fix linting warnings causing tests to fail