Refactor vcs functions
Refactor testing module
Improve attributes coverage