Test refactor8