Intermediate checkin for test adapter refactor.