implemented new test for unpacking, refactoring