update tests - did this with Simon's script, I hope this works, looks right, though