Added more containment tests and constructors.