Minor refactoring for coverage.
Moved album service functionality to media service for single api point.