refactored media model spec
fixed conflicts