Revert "Group these tests for easy running"

This reverts commit 8004390d838be12317ffce437f8c04d8f42c62a0.