Very good points! For some reason I haven't thought of the simplest solution - to have test structure correspond *exactly* to code structure. That means creating test modules for application modules (already implemented) and creating test packages for application packages (TBD). Thank you for the input, I would have made things more complicated (and still broken!) without it.