Much improved tests