On the right path to fix tests