INTERNAL. legacy tests cleanup