Test improvements to the last merged PR.