Updated unit tests and renamed packages.