Pass unit tests, misc fixes, requires one filter