fix: tests due to client Id appearence