Correct Consumer and add more tests