Fixed Container init and added tests