ML-1 | Fixing tests