Tests for #update_manager and #delete_manager
Merge branch 'master' into patch-2