test cases finalization. Added changes for SA and DA