More tests
Fixed a bug with weird expressions
Fixed typo