Fixed unpacking and updated tests
Usability fixes