Merge "Tweak resource type inspection test" into idea133