Seperate initialization in tests from initialization for client