Mike: restored Rspec expectations