changing test usage of RESTClientsRetriever
changing compilation to Java 7