Improving test efficiency. Refactor tests
Merge branch 'Unstable' of https://github.com/telefonicaid/Rush into Unstable