Minor checkstyle changes to clean up this week's work. Moved two files marked in their comments as unused in the system to old.testfiles as a temporary measure. These will likely get remove later.