Revert "restructure test"

This reverts commit aa249cc827d3efbde59adad616807f64b7309a8f.
test