Nothing much to add. Filled in a couple tests.
Remove nested package.