Filter tests done except for iteration tests.
Filter tests except Iterations. Fixed merge conflicts, still a little messy, still cleaning it up.
Fixed more merge conflicts on filter tests.