Added tests. Cleaned up Video