Update video code to JDK 7 and JUnit 4