fix failing tests and a "remove" from container regression