Created test harness, updated client