Package / test cleanup.