WL-3153 My missing test refactorings from the first time.
Merge pull request #127 from ox-it/WL-3153

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