Add some more builder tests