ACCUMULO-2650 Forgot the junit test annotation
ACCUMULO-2579 More tests, cleanup of debugging left in code.