Test refactor v2