CT-42 added test for suites
CT-42 removed some commented lines
merge to master