adding container option, and tests