Fix to tests