Ashwin,Dileep | Fixing tests