Fix test
Fix call to notify component_removed
Fix pop(-1)