[WF4] Public interface corrections.
[WF4] More test tidying.