c5.6 exercises 1 and 2, updating rspec tests and making less repetitive