Fix for issue #158

Fix for issue #158 https://github.com/balderdashy/waterline/issues/158.
Change the tests accordingly
Merge pull request #160 from Thomasdezeeuw/master

Fix for issue #158