Write builder test
CS FIXER
Introduce context builder