tuple issue fixes
Fixed a few more unit-testst
Merge pull request #189 from jaytaph/popblock

Popblock