Mihir | Fixing tests