Ajay | #4102 | Fixing tests after refactorings and optimizations