Dileep| Fixing tests