Tidying up the way we extract data from entity bodies.

Removed a println too.
Changed to using shared server for functional tests.