Merge pull request #397 from pedroigor/master

[PLINK-593] - Keep order when configuring paths.
[PLINK-593] - Fixing tests.