fix broken legacy tests