(cherry picked from commit 4915920d71)
4915920d71
- Move legacy tests into a separate directory. - Reduce common dependencies between targets.