Added interfaces in case of Enums and made other changes. Unit Test passes.