[WIP] Fix for failing specs

Trying to make the test pass, since travis is dying the last few weeks on every push :(

Somehow this seems to fix the issue locally, not sure why though.. Lets see if Travis agrees as well.