Test structure reorganization.
Merge branch 'master' into tf/tests