Merge "Drop OfficialClientTest and NetworkTest"