Test improvements and modernisation