Several changes in tests and unhooked loading, base class for hooked