Akshay/Pooja: fixed some tests