fix one test and add all Disaster overload

Add a new API