Changes to support legacy tests