Found a 'workaround' for the hardcoded test name.......