Fixing test suite runner to use decent bootstrapping