Completed test modularity in test_cyl.cpp