Refactor feature tests
Refactor test suite