WL-3153 My missing test refactorings from the first time.