Use new APDU parameters
Reordered tests to have continuing flow, catch some exceptions to prevent test from failing