Fixed the last two client tests after the Big Merge (tm)