Tightens up tests