Improves build tests