Fix tests Export
Fix parsing output of src and failing tests