Update tests to new enum API