Update test outputs from frontend changes.
Merge pull request #185 from pjonsson/more-simplification

Update test outputs from frontend changes.