Refactor in test suite, make everything more clear