Returned PolicySettingTestCase, formating and small messages fixes