fix context issue
fix tests