Before a Wasiyyah is done, there should be proper Islamic Estate Planning done. This is to ensure accuracy eventually on the things to be included in the Wasiyyah.