fix tests, use multimatch