Finish rewriting specs to use updated RSpec syntax