Small test fixes
Formatting, implemented ADD in builder (remote only)