Small fix for playlist highlighting + add extra checks to unit tests