Added usernames and editing rspec tests