Remove uses of client outside of base test class.