supporting expressiions with chaves
fixing all tests