Add more flexible function to extract SWID from output during testing.