Dileep/Ashwin | #3155 | Fixing tests