Added songManager + Tests