More extensive fixes
Fixed use of allclose (default tolerance is quite low)