Added two more tests for client