Yes. You are right.
This pull resquest is a kind of shotgun surgery.
Perhaps we should close it. Then break into 2 pull request. One for organizing tests, and other of the feature it self.