reorganized tests

(cherry picked from commit a0a73c060168325ed604973c69612115e2edf769)