adding stop/remove functions for containers and related tests