Fix tests, in worst way possible.
Merge pull request #1 from anall/master

Fix tests, in worst way possible.