Test corrections suggested by @pads