More fixes to test consumer