Use clearer file names in tests