Ch6 completed with tests passing