[WIP] Refactor test suite