Yogesh/Ashwin | #2481 | fixing tests