Pulls in test fixes plus some other small changes