tuple issue fixes
Fixed a few more unit-testst