upgraded to spring 4.0 release
Add more complex filter tests, including labels.

These have failing assertions which are currently commented out.
Add missing TEST_DIR in script tests