added srv validation to end phase forms + refactor
integration tests fixed after refactor