fix context dependencies. todo tests