change test file extension; small cleanup in test execution