Minor cleanup
Composers should not be instantiated for every item read from source
Now testing source with mocks