Changes RSpec config to verify mocks
Improve consistency of naming in fixtures