Fix enum names that were not updated in the tests. Change-Id: Id1bb71d997e710028759a9e9a2e0b24e35f92fc4