moved the subsonic stuff to a class that the added tests works