Refactor test suite exercise 5.6