Added test dir and two cylinder tests to make_watertight.