V2 | #00 | Fixing tests