FLUID-4907: fixed broken unit tests

Fixed the builder unit tests. Also fixed a couple of minor bugs in builder itself.