fix test suite builder logic