trips in contract.
buggy tests after rewrite of contract