ACCUMULO-1890 Clean up the test to avoid spinning up a MAC
ACCUMULO-1890 Forgot to re-add changes before commit