Bugfix subsequent match + extra tests.