Converting filter tests to JUnit4
Merge branch 'trunk' of https://github.com/mc1arke/ant into trunk