Use simple consumer API in tests and refactorings