Bug fixing + test client added