Decouple TestRestApi from TestWebservice