Fixes tests related to getting and removing instances.