Feature/test dispatcher

See #313