Add back tests missed from merge