Improve tests (#679)

10 files changed