Remove a whole bunch of rspec failures

Signed-off-by: Ken Barber <ken@bob.sh>