Add more consumer tests