Lots of changes in output tests