Refactored VideoQueue, added tests