TAP-2388: Update test and example app