Finish test changes started in 7ece665d16714db0979bde5df254231c5be24f10