Refactored packaging to use mock