Updated tests to reflect output changes.
Merge branch 'master' of https://github.com/kframework/k