Test get_provider/get_plan returns None if not availble
Remove unreused function
Remove unreused function
Change variable to local scope
Add persistence test