Removed agglevelsup change and fixed regression tests