removed TestClient as it is not in use, refactored Factories to utility methods on BaseTest