Removing usages to statics in our tests.