More tweaks to get create_instance() to behave correct wrt the tests