Added some unit tests for expressions