Revert "merging test suites"

This reverts commit fad72facdf8824eee02b72eb7ad602703cfec2d8.