Dropped a TODO. I think what we're doing now is right, because otherwise it wouldn't be possible to run tests without maven, and I don't want to impose that on everybody.