Remove custom dispatcher, fix tests