test fix and shared consumer work