got all legacy tests working now