Commenting a test.
Refactoring control system to add configurability.
Refactoring match spec.
Minor improvements.