Attempting to update files to fix rspec issues