Rename tests according to new guidelines