Moved output generation to: make test