Test files for #21