Fix Test Breakage from Injection updates

Easy stuff. I also cleaned up the "create new kryo instance" methods.