Fix tests
Merge branch 'feature-bump-data-kitten' into staging