Remove Unused Code
Updates for Now Playing Unit Tests

Alterations so Now Playing is testable.
Include those tests as well.