Additional test fixes from review