Finished ch13 tests and some more debugging