Updated test client framework. Also updated existing tests to make them work with changes.