independence day: rewrite aswer output, rewrite data source format, improve triggering
independence day: edit tests to pass with new ouput format