Revert "Group one tests"

This reverts commit a3e22dee53dfff521862dd1045a672768c0ebb48.