Unit tests for structure generators in each service.
Small fixes to the REST client discovered during unit tests composition.