Added tests for kitten data model, minor refactor to kitten data model