Yes, the diff is just a messy.  I made commons-io available outside of the test scope since I use FileUtils.delete and moved it up a couple lines. derby didn't change.