fix naming conventions and HgBasicTest.test_heads