Fixed failing tests.
Fixed lints
Merge pull request #388 from angathorion/test-fix

Fixed failing tests.