Added tests for expressions, slight tuning and fixing some of issues that have not been seen before