remove some debugging code, give tests nicer names