Order of keywords is important.
Use complete matchtype for testing.
Remove obsolete test.
Fix a couple of tests for the matchtype and add new missing tests.
Merge branch 'master' of https://github.com/RoPython/wispy