Special folder variables no longer end with separator. Added related test.