Test improvements

[skip ci]