Changed a couple of event based tests due to the change in the ordering
Fixed the export test
Merge pull request #1493 from gem/filtering-sources

Ordering the sources after filtering-splitting