Make build pass with recent rspec
Remove rspec varnings