Item merge fix specs failing due to recent code changes

Should have run the tests and caught these earlier - d'oh!   Fixes specs for  DOR content type 'media' now being treated as 'file' and for verification of collection record in Solr looking for the correct purl, even if it's a merged coll rec.