Cleanup 'container lookup is normalized' test

This addresses code discussion in up #2350.
Merge pull request #2359 from pangratz/cleanup_test

Cleanup 'container lookup is normalized' test