Anishek | #2059 | fixing tests