Add: unit tests for clients area