Task #0032: Preparing for longer match lists.
Misc #0000: Fixing test failure.
Task #0030: Review comment - extended testing.