Clean up test classes
Updated to Mercurial 2.9.2
mercurial: add 2.9.2 bottle.