This task should improve the coverage and clarify the existing test in client-core where needed.