add context to bundles + fix unit tests