Fixed sub-package references. Commented out broken top-level test code.