Standardising test package in safe.storage.