Fixes tests so that all specs pass

Now whenever we git commit/push, Travis CI won't fail us