Code pro for tests

CodePro fixes for test files.