Add the filename of the file being tested in the test messages.
Merge conflicts in interaction_cmd.ml