Cleanup #imports
Reorganize unit tests
Cancel current video operation before starting a new one