BUG: Various tubeObject and tubeMacro fixes

Change-Id: I83c61b72a762c5bb78e1d4f837af01841ec99441
WIP: UseTubeMacros

Change-Id: I6420ab38c5b9f627a97f2ff01f9c5f5c011590c7