refactor test to match Client domain