Fix some test failures due to AttributeInstance schema changes