Fix test
Improve build script