Fixed unit tests
Initial commit of refactored media bundle