Streamline CONTAM object construction, add test