Some minor fixes for the matches in the variant list (prefixes and suffixes) and started on constructing a test suite