additional edits to get tests running on forecast