minor cleanup for bat tests