Adjust tests for recently changed enums