Added test
Initial support for wrapping statements in expressions