DEVIDM-54: Changed affiliations to enums and added tests.