merged test client into master