Simplified RemoveClient, completed tests
Added presentation, fixed test case