Minor test improvement and cleanup