Re #934. More tests. Special cases.
Merge branch 'feature/934_wiener_filter' into develop