Fixing tests and build
resolved merge conflicts