changing to new master client system and tests.