added CatchAll filter, more tests