Maybe fixing tests