FIX: the execution order was not properly set for the single files

Also added more precise unit test