Added tests for expressions, fixed expression parsing