Additional expressions and tests

The change also includes #1