fix test errors from merge