fix tests, contract definitions in fixtures