Feature/filter after resolution

Finally, a solution to #34 (closed) all uni tests pass now, even one that did not before and that I did not intend to fix.