#195 Fixed common tests, including dispatch