SCHEMA-166. Clean KijiClientTest to prepare merge with AbstractKijiIntegrationTest