Cleaning Collection code.
Tests: Fixed wrong namespace.
Added new tool Client.