Some Improvements.
Added Some Client Tests