Make the test dir of ant match intellij
Make integration tests use spring context more sensibly.