Also renamed spec/expectations to spec/expects