Revert back to subtests