Updated test runner, moved demo to test
Fixed controls