TIKA-1422 - Fixing build & minor refactory of naming test class

git-svn-id: https://svn.apache.org/repos/asf/tika/trunk@1633331 13f79535-47bb-0310-9956-ffa450edef68