Added "default file" feature and updated tests