Updated client model tests