Builder tests fixed