Convert List Identifiers to Enums and Add Many Unit Tests

Change-Id: I3d8f9bebafd3cf4053a4489d0c93765cbb6999c7