Test runner.
Minor change for the sake of simplification and flexibility.
Spec2 update.