Fix tests and type error problems
Merge pull request #10 from Lothiraldan/fix_tests

Fix tests and type error problems