Fixed instance iterator unit tests related to last commit.