Excercise 2 and refactor rspec for excercise 1