Fix for multiple return values from -test-paths