Added support for bundle-items.
Fixed non-legacy integration tests.