Fix test so that it is valid, and make client work