Cleaned up test client