Tests sharpened