Classic Test Runner fixes