Restored missing commits
Merge pull request #58 from cloudspace/68359332_user_feed_data_source_tests

Restored missing commits