Ashok | fixing tests