trim_package: accept pilot uuids properly, better tests