Ashwin /Pooja | #3066 | fixing tests
Pooja/Ashwin | #3066 | Removing entity type from project
Pooja,DC| #3066 | Fixing functional tests