Improve test
Move all builder tests into "core functionality" section