[Specs] Fix issues related to sorting files