Typos fix + simplifications

This pull contains simplifications (direct EM injections) and cosmetic changes. Warning: the integration tests was never successful on my machine:

 ? IllegalArgument ArquillianServletRunner not found. Could not determine Cont...
  VersionResourceTest.testLog:116 ? MalformedURL For input string: "8181rest"
  VersionResourceTest.testWrongJson:136 ? MalformedURL For input string: "8181re...
  VersionResourceTest.testGetData:153 ? MalformedURL For input string: "8181rest...
   ? IllegalArgument ArquillianServletRunner not found. Could not determine Cont...