Match statements can now return values properly when using non-dynamic tags. Added in a few test cases and tidied up the test-suite.