rspec-related fixups