Rebasing tests based on previous bugfix
Just deveopment