BUG: Various tubeObject and tubeMacro fixes

Change-Id: I83c61b72a762c5bb78e1d4f837af01841ec99441
WIP: UseTubeMacro

Change-Id: I1e7d41f2dde22e45608dc8465a11d6d7f97bc60e