Refactored some testing, finished Chapter 5 exercises