Ajay/Pooja | #2809 | Fixing broken JS tests