Add some builder API tests