DERBY-6350

Committing the test cleanup provided by Brett



git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/trunk@1536808 13f79535-47bb-0310-9956-ffa450edef68