Account for API changes
Special case for enum entries is not needed any more
Synthetic classes created for enum entries
Test data fixed