Test refactroing