Add further tests after refactoring

Add new unit tests for the new functions after the refactor and update
the previous unit tests for ToPack

Signed-off-by: Charalampos Mainas <cmainas@nubificus.co.uk>

Author: cmainas