Fix tests and rerender map based on aol/ol
Legend work