Fix failed tests

Got it. So, the functionality is not "lost" but you just moved it to SvcBus related code ?