1.) names to tests, 2.) cleanup of packages vs. shims.