[HG] Fixing tests.