Small serialisation tweaks.
Improved tooling api fixtures so that they clean up the services after use. This will be needed later for the file lock improvements.