Improve build tests