Adding dispatcher class + test class