Adapted test runner to the latest code changes.