Fix adding hwtests with multiple files.