Sort after pushing foldername
Tests written for template