Normalized bubble/tunnel objects

Which makes it much easier to setup mock classes to reflect information
Added tests for normal and deferred Actions