Refactored tests and started on tuple:unpack