fix all tests
add TokenValueProvider for non-event token replacement