PMD
Updates tests
Adding tests