Fix unit test names; Fix failing test

Pretty simple changes here. Note: the travis-ci build is currently failing on the master due to PMD being enabled but violations present. Just to be sure, I also confirmed that no new PMD violations were introduced by this single-line change.