Fixing tests
WIP with @malycL