tests: refactoring
Helpers: createDefaultClient() remembers last instance