Fixes and updates

This PR fixes one breaking bug and removes an RSpec deprecation warning.