Anishek/Ashwin | #2298 | correcting failing tests