Add extended and comprehensive test with real life container numbers