I think there's a lot of static stuff in this test anyway. E.g. lot of Client.call() calls in IntegrationTest.scala that need a static Client class and also ServerInstance, in the multi-server mode directly accesses ManagerInstance.instance() - which is one big cause of the static-ness. I'm not too much in favor of this change - it would just further hide the fact, but wouldn't solve the problem.

If you insist is it alright to make like hundred of changes to IntegationTest.scala where Client.call is used ?