Maybe use the Testing client here instead