Fix minor things

[SylvainJuge]

• move remaining versions to catalog
• reformat
• use elastic entrypoint in agent-for-testing: required to create a separate module to avoid cyclic dependency.