Fix tests and update properties for 2.1RC2
Testing Done:
Issue Number:
Approved by:
Reviewed by: