Cleaned up some packages.
Cleaned up test packages.