Fast fix for the 'known' bug
Fixing tests