connecting the remainder of the old tests