Should fix tests