testing mantis issues
1211 CMS Test (please do not close)
1211 CMS Test (please do not close)
1211 CMS Test (please do not close)
fixed 1211
re #50 fixed unittests