Add explicit holder check to test