restore tests accidentally nuked in 2b7b86cc097b4448fb