Builder: fixed a regression in ADD. Improved regression tests for build behavior