Remove dependency on REST/Server/Tests/BaseTest