Fix warnings in tests, make tests pass again
Merge pull request #3 from retupmoca/master

Fix warnings in tests, make tests pass again