add more legacy tests