Add non regression tests for the subdir case.