converted remaining client unit tests