add new test for debuging a match-call and fix stuff