Cleanup 'container lookup is normalized' test

This addresses code discussion in up #2350.