Anishek/Ashwiin | #1897 | fixing the tests