More changes so that our specs work under travis