Fix the unit test build. This also removes some debugging messages that were cosmetically changing a lot of integration tests. Don't know how I missed these in the first place.