End of chp. 8 - Pre Cucumber refactor