fixing more find replace fallout
separating instantiation and CF/KS/HH init
fixing misc tests
fixing DatabaseDescriptor initialization in some tests