Modularized check_watertight capability for testing purposes. Moved test_cyl back into the test dir permanently.