Fine tune test suite