Add env properties for AppIdentity tests.
Simplify prop handling.