Fix Payment tests (only one disabled because behavior changed, so failure expected, probably test should be removed)