Fixed #122 -- CLI-driven test suite.