ALM-612 further refactoring of sources
ALM-612 refactored more rspec tests for the new source model