Add remaining unit tests for builders