Fixes #571 : Unable to run legacy tests