Fix three more dispatcher tests