Maid 335 expected table hadling

Expected table computation implemented for vault starting and vault exiting. Test cases have been updated