Test improvements to give more information