Modify tests to use new utility function for generating output paths