More fixes to modal editing
Update tests for api uri path changes, other changes