Add tests and fix container setup handler initialisation