Fixed error in test output

Was:
```
trace('$f2 should be $f2');
```
Now:
```
trace('Error in "$s"; expected $expected but was $result');
```