'content', db_dir)
> +        songs_dir = os.path.join(content_dir, 'songs')
>          logger.debug("Content dir set to %s" % content_dir)
>
>          # copy content
> -        shutil.copy(os.path.join(content_dir, '1.ogg'), musicpath)
> -        shutil.copy(os.path.join(content_dir, '2.ogg'), musicpath)
> -        shutil.copy(os.path.join(content_dir, '3.mp3'), musicpath)
> +        if os.path.isdir(songs_dir):

I'm concerned here that we might need to remove these three specific files (for the empty library test) or the tests will fail on the phone. Removing specific files should be safe enough to not remove Andrew's Music library :p