Revert "Add new test group, move taking test cases to the new one."

This reverts commit 6420f9d4cedf57579ed84f4dc117072337cedb4c.