Refactor: Rearrange test suite internals