Fixed broken/rigged client model tests