fixed rspec and the like!