Merge "Add TEST_MAPPINGs for toasts"