Weird, I corrected the if-statements, but now all unit tests on Travis CI seem to fail, while over here they work correctly...