fixed dispatcher and included unit test stats