Fixing tests running