Added/modified/fixed tests after complete expression engine refactoring