Code improvements based on CodePro analytics
Testcode improvements based on CodePro analytics