Finish Chapter 5 test suite exercises
Merge branch 'filling-in-layout'

"Finished Chapter 5 test suite exercises"