Added test function, changed video controller