Anishek / Ashwin | #2193 | Correcting tests