fix container and testing minors