REVIEW-1841 Fixed deprecation.
Tidied up a TODO. The specific assertions in this test looked more confusing than using the dependencies task for checking.
Fixed an integ test.
Removed a test that didn't add too much value but added trouble.

This was the test for a no-longer used, discontinued method. More over, it was covering trivial code. The deprecation logger / logback interferes with system properties enough to make maintaining this test troublesome.