Fixing build and tweaking UI test building.