Additional test fixes... only 17 failures!