Fix problems from not re running tests