- finalize PoC for the service tests