Improve tests. Fixes WFE-1190.