Merge "Permit case independent unit test directories"