Add tests for multi-string expressions
Fix macro expansion, add test for macros
Add count operation
Add when
Update readme