Removed throw_on_fail
Fixed broken tests