Is there a reason for these TODOs?  It seems like the way to resolve SCHEMA-158 would involve Kiji keeping track of the HBaseAdmins that it creates, and clean them up when the Kiji object is cleaned?  In that case, this wouldn't affect the cleanup in the tests.