Fix up econ tests