Improve test suite – minor