Made some test client tweaks.