fixing System / Consumer tests