Refactors catfacts to improve test coverage