Added path validation + unit test for this