cat-back-and-forth completed, debugged and test coverage improved