[RFC] Fixtests