Changed compiled container binding storage for faster lookups.
Improved code coverage in tests.