fix some of the naming in test dir