Test and kat object now in their own modules. Tests are passing.
Ignore cruft.