artf809437 : WU-Dashboard-Framework-3.1:Code Cleanup & Unit testcases