Additional test fixes