Move tests to a separate file. Add more unpack methods