Write Unit Tests for Clients #29