Add exercise 5 tests and refactor test packages