label/req tests refactor