Some RSpec fixes