Changes to fix behavior of instance testing