restore a couple of tests removed earlier