FilterStrategy tests and bugfixes... ready to try it live