New test case and minor fixes

Adds a new test case for expressions, removes test13 and fix some issues with conditional expressions and makefiles.