Add Container tests