Fixes spec flakyness
Reduces number of bus messages