Better build
Better test organization
Minor
Fixing consumer-driven tests
Fixing identation
Refactoring tests