Improvements in cms/application test classes