Fixed builder tests.