Added failing functional test
Cleanup one unit test, add a failing unit test
Fix code to make unit + functional tests pass
Rename functional test
Make functional test name actually reflect the test
Fix upgrade unit test to drive public API
Merge pull request #256 from dmose/fix-upgraded-local-video

Fix upgraded local video