Refactor tests, add test for unpacking expressions