Changes in dispatcher and unit tests