Tweak some tests to make them a bit more flexible.

Also fixed guard and attempted travis fix