Improve tests. Fixes WFE-1190.
Merge branch 'develop' of github.com:wf4ever/rodl into develop