Updated tests following dispatch flow changes, relates to issue #56