Rewrite some of the tests as per Jeremy's suggestions