Updated test runner from master