Refactor: Test refactor