Eliminated some RSpec deprecation warnings