Move around some RSpec tests as per exercises chap5