Better return message.
Fixes tests
Adds Register mechanize for Sources.

This should allow us to use different sources.