Merge "Remove useless TestRunner"