merge, add client5Test, exception test finished
merge