Refactor tests and more...

I accidentally skipped over the end of chapter five so I returned to do
the exercises and some refactoring.