Improve test suite, and perform some builder fixes