Code factorization: wrapping the unit tests in static classes (e.g. top-level variables)
Fixed bugs
Added unit tests of Client class