[WIP] Added BuilderTest