[2.0.0] Changes to build script

Stable testsuite to be hopefully always run successfully.