Fixes for new tests brought in for master.