toolbox: Improve test suite