PMD issues
Fixing unit test for issue 64