Fix falling tests