[] Removed uneeded unit tests.
[] Removed uneeded unit tests. And added a client one.