Refactor test
Regroup tests standalone version