Fixed couple issues with test-path handling.