p72 add tag and refactor tests