Context in manager fix, review integration tests