put back in a couple of tests