Added route filtering.  Also tried to fix some tests
Manual merge